From ca71340c6bfa10092c756e5fdd5e41230e2981b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Fri, 18 Oct 2019 11:44:32 +0200 Subject: [PATCH] Adwaita: Fix menubutton in headerbar margins Add the margins to the menubutton and not the button inside the menubutton. This way popovers properly point to the inner button again instead to somewhere 6px off. --- gtk/theme/Adwaita/_common.scss | 10 +++++++++- gtk/theme/Adwaita/gtk-contained-dark.css | 4 +++- gtk/theme/Adwaita/gtk-contained.css | 4 +++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 4568416ba3..c7eb975045 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1695,10 +1695,18 @@ headerbar { entry, spinbutton, separator:not(.sidebar), - button { + button, + menubutton { margin-top: 6px; margin-bottom: 6px; } + + // Reset margins for buttons inside menubutton + menubutton > button { + margin-top: 0px; + margin-bottom: 0px; + } + switch { margin-top: 10px; margin-bottom: 10px; diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 1e64a95f84..a6654a0257 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -705,7 +705,9 @@ searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; } .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd .titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd headerbar:backdrop:dir(rtl), .solid-csd headerbar:backdrop:dir(ltr), .solid-csd headerbar:dir(rtl), .solid-csd headerbar:dir(ltr) { margin-left: -1px; margin-right: -1px; margin-top: -1px; border-radius: 0; box-shadow: none; } -headerbar entry, headerbar spinbutton, headerbar separator:not(.sidebar), headerbar button { margin-top: 6px; margin-bottom: 6px; } +headerbar entry, headerbar spinbutton, headerbar separator:not(.sidebar), headerbar button, headerbar menubutton { margin-top: 6px; margin-bottom: 6px; } + +headerbar menubutton > button { margin-top: 0px; margin-bottom: 0px; } headerbar switch { margin-top: 10px; margin-bottom: 10px; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 46c1757580..15bbbf4959 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -713,7 +713,9 @@ searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; } .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd .titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd headerbar:backdrop:dir(rtl), .solid-csd headerbar:backdrop:dir(ltr), .solid-csd headerbar:dir(rtl), .solid-csd headerbar:dir(ltr) { margin-left: -1px; margin-right: -1px; margin-top: -1px; border-radius: 0; box-shadow: none; } -headerbar entry, headerbar spinbutton, headerbar separator:not(.sidebar), headerbar button { margin-top: 6px; margin-bottom: 6px; } +headerbar entry, headerbar spinbutton, headerbar separator:not(.sidebar), headerbar button, headerbar menubutton { margin-top: 6px; margin-bottom: 6px; } + +headerbar menubutton > button { margin-top: 0px; margin-bottom: 0px; } headerbar switch { margin-top: 10px; margin-bottom: 10px; } -- 2.30.2